From b2757765c30b6ff816bf0c8fc484ec11d3605bf4 Mon Sep 17 00:00:00 2001
From: "kaf24@scramble.cl.cam.ac.uk" <kaf24@scramble.cl.cam.ac.uk>
Date: Fri, 5 Mar 2004 23:15:11 +0000
Subject: [PATCH] bitkeeper revision 1.768 (404909ffr4wvLzxTHDh9qHzdwhs66A)

Makefile, xen-clone, Xeno-HOWTO.txt:
  Fix XL makefile to accept ARCH override from the environment.
---
 Makefile                         |  2 +-
 docs/Xeno-HOWTO.txt              |  4 ++--
 tools/misc/xen-clone             | 12 ++++++------
 xenolinux-2.4.25-sparse/Makefile |  2 +-
 4 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/Makefile b/Makefile
index 388f3c4253..c1798e1963 100644
--- a/Makefile
+++ b/Makefile
@@ -4,7 +4,7 @@
 # Builds everything except Xenolinux:
 #  cd xenolinux-<version>-sparse
 #  ./mkbuildtree <build dir>
-#  cd <build dir> && make ARCH=xeno oldconfig dep bzImage
+#  cd <build dir> && ARCH=xeno make oldconfig dep bzImage
 #  (<build dir> should be a vanilla linux tree with matching version)
 
 all:	
diff --git a/docs/Xeno-HOWTO.txt b/docs/Xeno-HOWTO.txt
index f89ac3b2ab..9a74bbd749 100644
--- a/docs/Xeno-HOWTO.txt
+++ b/docs/Xeno-HOWTO.txt
@@ -95,8 +95,8 @@ oldconfig') but you can customise using one of the other config tools
 if you want.
 
   # cd /xeno-1.2.bk/xenolinux-2.4.24
-  # make ARCH=xeno oldconfig   { or menuconfig, or xconfig, or config }  
-  # make ARCH=xeno dep bzImage
+  # ARCH=xeno make oldconfig   { or menuconfig, or xconfig, or config }  
+  # ARCH=xeno make dep bzImage
 
 Assuming the build works, you'll end up with
 /xeno-1.2.bk/xenolinux-2.4.24/arch/xeno/boot/xenolinux.gz. This is the
diff --git a/tools/misc/xen-clone b/tools/misc/xen-clone
index 984ec7cbe3..43ffb498ea 100755
--- a/tools/misc/xen-clone
+++ b/tools/misc/xen-clone
@@ -86,11 +86,11 @@ cd ../..
 mv linux-${LINUX_VER} xenolinux-${LINUX_VER}
 cd xenolinux-${LINUX_VER}
 
-make ARCH=xeno oldconfig
-make ARCH=xeno dep
-make ARCH=xeno bzImage
-make ARCH=xeno dist || make ARCH=xeno install
-make ARCH=xeno modules
-make ARCH=xeno INSTALL_MOD_PATH=${TOP}/install modules_install
+ARCH=xeno make oldconfig
+ARCH=xeno make dep
+ARCH=xeno make bzImage
+ARCH=xeno make dist || ARCH=xeno make install
+ARCH=xeno make modules
+ARCH=xeno make INSTALL_MOD_PATH=${TOP}/install modules_install
 cd ..
 
diff --git a/xenolinux-2.4.25-sparse/Makefile b/xenolinux-2.4.25-sparse/Makefile
index 12d45ac320..b6ccfb4d95 100644
--- a/xenolinux-2.4.25-sparse/Makefile
+++ b/xenolinux-2.4.25-sparse/Makefile
@@ -9,7 +9,7 @@ KERNELRELEASE=$(VERSION).$(PATCHLEVEL).$(SUBLEVEL)$(EXTRAVERSION)
 # Unless overridden, by default ARCH is equivalent to SUBARCH.
 # This will be overriden for Xen and UML builds.
 SUBARCH := $(shell uname -m | sed -e s/i.86/i386/ -e s/sun4u/sparc64/ -e s/arm.*/arm/ -e s/sa110/arm/)
-ARCH := $(SUBARCH)
+ARCH ?= $(SUBARCH)
 
 KERNELPATH=kernel-$(shell echo $(KERNELRELEASE) | sed -e "s/-//g")
 
-- 
2.30.2